[READY] - nixos-modules.routers.*: frr updates and ipv6 tests by sarcasticadmin · Pull Request #1104 · socallinuxexpo/scale-network

sarcasticadmin · 2026-02-27T02:55:26Z

Description of PR

Including the ospf6 daemon and appropriate v6 links. Additionally support trunk interfaces as args to routers to be able to test between vm and bare metal. Thank you @kylerisse and @djacu for helping with this!

Previous Behavior

ipv4 routes on router ospf vlans
ospf daemon only
cooper0 assumed trunk interface

New Behavior

ipv6 routes added to vlan90x vlans
ospf and ospf6 services running
added trunk Interfaces option for routers.{conf, expo}
vm tests for ipv6 links
vm tests for relays and radvd

Tests

Tests pass in CI
Tests pass on bare metal

[root@router-conf:~]# vtysh -c 'show ipv6 route'
Codes: K - kernel route, C - connected, L - local, S - static,
       R - RIPng, O - OSPFv3, I - IS-IS, B - BGP, N - NHRP,
       T - Table, v - VNC, V - VNC-Direct, A - Babel, D - SHARP,
       F - PBR, f - OpenFabric, t - Table-Direct,
       > - selected route, * - FIB route, q - queued, r - rejected, b - backup
       t - trapped, o - offload failure

IPv6 unicast VRF default:
C>* 2001:470:f026:500::/64 is directly connected, bridge500, weight 1, 00:09:20
K * 2001:470:f026:500::/64 [0/256] is directly connected, bridge500, weight 1, 00:09:22
L>* 2001:470:f026:500::1/128 is directly connected, bridge500, weight 1, 00:09:20
C>* 2001:470:f026:501::/64 is directly connected, bridge501, weight 1, 00:09:20
K * 2001:470:f026:501::/64 [0/256] is directly connected, bridge501, weight 1, 00:09:22
L>* 2001:470:f026:501::1/128 is directly connected, bridge501, weight 1, 00:09:20
C>* 2001:470:f026:502::/64 is directly connected, bridge502, weight 1, 00:09:20
K * 2001:470:f026:502::/64 [0/256] is directly connected, bridge502, weight 1, 00:09:22
L>* 2001:470:f026:502::1/128 is directly connected, bridge502, weight 1, 00:09:20
C>* 2001:470:f026:503::/64 is directly connected, bridge503, weight 1, 00:09:20
K * 2001:470:f026:503::/64 [0/256] is directly connected, bridge503, weight 1, 00:09:22
L>* 2001:470:f026:503::1/128 is directly connected, bridge503, weight 1, 00:09:20
C>* 2001:470:f026:504::/64 is directly connected, bridge504, weight 1, 00:09:20
K * 2001:470:f026:504::/64 [0/256] is directly connected, bridge504, weight 1, 00:09:22
L>* 2001:470:f026:504::1/128 is directly connected, bridge504, weight 1, 00:09:20
C>* 2001:470:f026:505::/64 is directly connected, bridge505, weight 1, 00:09:20
K * 2001:470:f026:505::/64 [0/256] is directly connected, bridge505, weight 1, 00:09:22
L>* 2001:470:f026:505::1/128 is directly connected, bridge505, weight 1, 00:09:20
C>* 2001:470:f026:506::/64 is directly connected, bridge506, weight 1, 00:09:20
K * 2001:470:f026:506::/64 [0/256] is directly connected, bridge506, weight 1, 00:09:22
L>* 2001:470:f026:506::1/128 is directly connected, bridge506, weight 1, 00:09:20
C>* 2001:470:f026:507::/64 is directly connected, bridge507, weight 1, 00:09:20
K * 2001:470:f026:507::/64 [0/256] is directly connected, bridge507, weight 1, 00:09:22
L>* 2001:470:f026:507::1/128 is directly connected, bridge507, weight 1, 00:09:20
O   2001:470:f026:901::/64 [110/10] is directly connected, bridge901, weight 1, 00:00:08
C>* 2001:470:f026:901::/64 is directly connected, bridge901, weight 1, 00:09:20
K * 2001:470:f026:901::/64 [0/256] is directly connected, bridge901, weight 1, 00:09:22
L>* 2001:470:f026:901::2/128 is directly connected, bridge901, weight 1, 00:09:20
O>* 2001:470:f026:902::/64 [110/20] via fe80::c04f:f1ff:feca:398c, bridge901, weight 1, 00:01:02
O   2001:470:f026:903::/64 [110/100] is directly connected, bridge903, weight 1, 00:01:02
C>* 2001:470:f026:903::/64 is directly connected, bridge903, weight 1, 00:09:20
K * 2001:470:f026:903::/64 [0/256] is directly connected, bridge903, weight 1, 00:09:22
L>* 2001:470:f026:903::2/128 is directly connected, bridge903, weight 1, 00:09:20
C * fe80::/64 is directly connected, backdoor0, weight 1, 00:09:20
C * fe80::/64 is directly connected, bridge503, weight 1, 00:09:20
C * fe80::/64 is directly connected, bridge903, weight 1, 00:09:20
C * fe80::/64 is directly connected, bridge505, weight 1, 00:09:20
C * fe80::/64 is directly connected, bridge901, weight 1, 00:09:20
C * fe80::/64 is directly connected, bridge504, weight 1, 00:09:21
C * fe80::/64 is directly connected, bridge502, weight 1, 00:09:21
C * fe80::/64 is directly connected, bridge506, weight 1, 00:09:21
C * fe80::/64 is directly connected, bridge501, weight 1, 00:09:21
C * fe80::/64 is directly connected, bridge507, weight 1, 00:09:21
C>* fe80::/64 is directly connected, bridge500, weight 1, 00:09:21

kylerisse · 2026-02-27T03:07:34Z

nix/package-sets/scale-nixos-tests/routers.nix

+      border.wait_until_succeeds("ping -c 5 172.20.3.2", timeout=60)
+      border.wait_until_succeeds("ping -c 5 172.20.3.3", timeout=60)

      # conference can reach border-expo link
-      conference.succeed("ping -c 5 172.20.2.1")
-      conference.succeed("ping -c 5 172.20.2.3")
+      conference.wait_until_succeeds("ping -c 5 172.20.2.1", timeout=60)
+      conference.wait_until_succeeds("ping -c 5 172.20.2.3", timeout=60)

      # expo can reach conference-border link
-      expo.succeed("ping -c 5 172.20.1.1")
-      expo.succeed("ping -c 5 172.20.1.2")
+      expo.wait_until_succeeds("ping -c 5 172.20.1.1", timeout=60)
+      expo.wait_until_succeeds("ping -c 5 172.20.1.2", timeout=60)


consistently getting 93s with time nix run .#hydraJobs.scale-nixos-tests.x86_64-linux.routers.driver and a warm cache

________________________________________________________ Executed in 93.14 secs fish external usr time 14.98 secs 0.00 micros 14.98 secs sys time 11.87 secs 825.00 micros 11.87 secs

kylerisse · 2026-02-27T03:07:49Z

nix/package-sets/scale-nixos-tests/routers.nix

+      border.succeed("ping -c 5 2001:470:f026:901::2")
      border.succeed("ping -c 5 172.20.2.3")
+      border.succeed("ping -c 5 2001:470:f026:902::3")


kylerisse · 2026-02-27T03:08:17Z

nix/nixos-modules/routers/expo.nix

    mkOption
    ;
+
+  genAttrs' = xs: f: listToAttrs (map f xs);


Well be setting passive-interfaces for ospf6 since it does not have the passive-interface default. Well leave ospf config as-is since its working well with passive-interface default

…tworkd

…orkd

kylerisse

#1105 !

kylerisse reviewed Feb 27, 2026

View reviewed changes

nix/nixos-modules/routers/expo.nix

mkOption

;

genAttrs' = xs: f: listToAttrs (map f xs);

Copy link

Member

kylerisse Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🦾

sarcasticadmin and others added 9 commits February 27, 2026 05:53

nixos-modules.router.*: router vlan ipv6 addresses

8cfc851

nixos-modules.services.frr: ospfv6

2b01c21

Well be setting passive-interfaces for ospf6 since it does not have the passive-interface default. Well leave ospf config as-is since its working well with passive-interface default

nixos-modules.routers{expo,conf}: param trunks

3fe720d

nix.tests.routers: add wait_until_succeeds to wait on learned routes

eebaba6

nix.tests.routers: check direct links

90f7980

nix.tests.routers: check additional services

96abece

nix.test.routeres: check ipv6 links that require routing

b4fac7a

nixos-modules.routers.border: interpolate WANInterface for systemd-ne…

5a30c13

…tworkd

nixos-modules.routers.expo: interpolate WANInterface for systemd-netw…

22836aa

…orkd

sarcasticadmin force-pushed the rh/1772076294frr3 branch from 5f4e277 to 22836aa Compare February 27, 2026 05:59

sarcasticadmin changed the title ~~[WIP] - nixos-modules.routers.*: frr updates and ipv6 tests~~ [READY] - nixos-modules.routers.*: frr updates and ipv6 tests Feb 27, 2026

sarcasticadmin requested review from djacu and kylerisse February 27, 2026 06:29

sarcasticadmin mentioned this pull request Feb 27, 2026

[READY] nixos: repo sync and disable gw on backdoor0 #1105

Merged

sarcasticadmin requested a review from owendelong February 27, 2026 08:06

kylerisse approved these changes Feb 27, 2026

View reviewed changes

kylerisse merged commit b1c7971 into master Feb 27, 2026
4 checks passed

kylerisse deleted the rh/1772076294frr3 branch February 27, 2026 18:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[READY] - nixos-modules.routers.*: frr updates and ipv6 tests#1104

[READY] - nixos-modules.routers.*: frr updates and ipv6 tests#1104
kylerisse merged 9 commits intomasterfrom
rh/1772076294frr3

sarcasticadmin commented Feb 27, 2026 •

edited

Loading

Uh oh!

kylerisse Feb 27, 2026

Uh oh!

kylerisse Feb 27, 2026

Uh oh!

kylerisse Feb 27, 2026

Uh oh!

kylerisse left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

sarcasticadmin commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Previous Behavior

New Behavior

Tests

Uh oh!

kylerisse Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

kylerisse Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

kylerisse Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

kylerisse left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sarcasticadmin commented Feb 27, 2026 •

edited

Loading